Skip to content

Add /switch-agent for per-tab AI agent selection#321

Closed
ashishpatel26 wants to merge 6 commits into
microsoft:mainfrom
ashishpatel26:fix/issue-295-per-tab-agent
Closed

Add /switch-agent for per-tab AI agent selection#321
ashishpatel26 wants to merge 6 commits into
microsoft:mainfrom
ashishpatel26:fix/issue-295-per-tab-agent

Conversation

@ashishpatel26

Copy link
Copy Markdown

Closes #295

Architecture finding

Each tab already owns its own independent agent pane (Tab::FindAgentPaneContent / Tab::StashAgentPane / Tab::RestoreStashedAgentPane in Tab.h). TerminalPage._agentPane is not a shared singleton — tabs are fully independent. This means multiple agents were already runnable simultaneously across tabs once the per-profile acpAgent setting (#302) was in place.

What this PR adds

A /switch-agent <name> slash command that lets the user explicitly change the agent running in the active pane on the fly, without touching other tabs:

/switch-agent claude      → restarts this pane's agent as Claude
/switch-agent gemini      → restarts this pane's agent as Gemini
/switch-agent             → lists available agents
  • Validates the name case-insensitively against KNOWN_AGENTS (claude, copilot, codex, gemini, ollama)
  • Sends a RestartRequest { agent_cmd: Some(new_cmd) } — the same path /restart uses, but targeted to a specific agent CLI
  • Clears the pane's session so the next prompt starts a clean conversation with the new agent
  • Other tabs are completely unaffected

Files changed

File Change
tools/wta/src/commands.rs CommandKind::SwitchAgent + registry entry
tools/wta/src/app.rs cmd_switch_agent implementation
tools/wta/src/slash_command_tests.rs 5 new tests
tools/wta/locales/en-US.yml commands.switch_agent.summary + 4 system.switch_agent_* keys
tools/wta/locales/*.yml (88 files) English fallback strings seeded (locale parity test requirement)

Testing

All 909 existing tests pass + 5 new tests:

cargo test (wta): 909 passed

New tests:

  • slash_switch_agent_no_arg_lists_agents
  • slash_switch_agent_unknown_agent_emits_error
  • slash_switch_agent_known_agent_triggers_restart
  • slash_switch_agent_case_insensitive
  • slash_switch_agent_all_known_agents_accepted

Remove ollama from BuiltinAcpAgents — it has no ACP adapter (empty
acp_launch_command, acp_flags, AcpAuthFlow::None) and cannot be hosted
in an agent pane. Delegate-only use is correct and unchanged.

Add "" to ollama's exe_search_order so extensionless binary discovery
works on non-Windows platforms.
Each tab independently manages its own agent pane, enabling simultaneous
multi-agent workflows across tabs (e.g. Tab 1 with Claude, Tab 2 with
Gemini). The new /switch-agent <name> slash command lets users switch the
agent running in the active pane without restarting other tabs.

Changes:
- commands.rs: add CommandKind::SwitchAgent and registry entry
- app.rs: implement cmd_switch_agent — validates agent name against
  KNOWN_AGENTS, clears session state, sends RestartRequest with the new
  agent's ACP command; bare /switch-agent lists available agents
- slash_command_tests.rs: five new tests covering no-arg list, unknown
  agent error, known agent restart, case-insensitivity, and all registry
  agents accepted
- locales/en-US.yml: add commands.switch_agent.summary plus four
  system.switch_agent_* message keys
- locales/*.yml (88 files): seed English strings to satisfy locale-parity
  test (every en-US key must exist in every locale)
Copilot AI review requested due to automatic review settings June 17, 2026 11:12

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

This PR adds a new /switch-agent slash command to restart the current agent using a selected profile, expands the known agent registry with an Ollama profile, and wires up localized UI strings and tests for the new command.

Changes:

  • Add /switch-agent command spec and route it through the command dispatcher.
  • Implement App::cmd_switch_agent to list agents, validate input, and trigger a restart with the chosen agent.
  • Extend the agent registry and tests (including adding “ollama”), and add localization keys for the new command/messages.

Reviewed changes

Copilot reviewed 94 out of 94 changed files in this pull request and generated no comments.

Show a summary per file
File Description
tools/wta/src/slash_command_tests.rs Adds unit tests covering /switch-agent behavior (no-arg, unknown agent, known agent restart, case-insensitive, acceptance loop).
tools/wta/src/commands.rs Registers the new SwitchAgent command and documents intended behavior.
tools/wta/src/app.rs Implements the /switch-agent command handler and triggers restart/state/session resets.
tools/wta/src/agent_registry.rs Adds an ollama agent profile and extends registry resolution tests.
tools/wta/locales/zh-TW.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/zh-CN.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/vi-VN.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/uz-Latn-UZ.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/ur-PK.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/uk-UA.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/ug-CN.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/tt-RU.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/tr-TR.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/th-TH.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/te-IN.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/ta-IN.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/sv-SE.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/sr-Latn-RS.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/sr-Cyrl-RS.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/sr-Cyrl-BA.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/sq-AL.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/sl-SI.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/sk-SK.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/ru-RU.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/ro-RO.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/quz-PE.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/qps-plocm.yml Adds pseudo-locale keys for /switch-agent summary + system messages.
tools/wta/locales/qps-ploca.yml Adds pseudo-locale keys for /switch-agent summary + system messages.
tools/wta/locales/qps-ploc.yml Adds pseudo-locale keys for /switch-agent summary + system messages.
tools/wta/locales/pt-PT.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/pt-BR.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/pl-PL.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/pa-IN.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/or-IN.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/nn-NO.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/nl-NL.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/ne-NP.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/nb-NO.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/mt-MT.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/ms-MY.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/mr-IN.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/ml-IN.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/mk-MK.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/mi-NZ.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/lv-LV.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/lt-LT.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/lo-LA.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/lb-LU.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/kok-IN.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/ko-KR.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/kn-IN.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/km-KH.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/kk-KZ.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/ka-GE.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/ja-JP.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/it-IT.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/is-IS.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/id-ID.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/hy-AM.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/hu-HU.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/hr-HR.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/hi-IN.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/he-IL.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/gu-IN.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/gl-ES.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/gd-gb.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/ga-IE.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/fr-FR.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/fr-CA.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/fil-PH.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/fi-FI.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/fa-IR.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/eu-ES.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/et-EE.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/es-MX.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/es-ES.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/en-US.yml Adds /switch-agent user-facing strings and locking hints.
tools/wta/locales/en-GB.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/el-GR.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/de-DE.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/da-DK.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/cy-GB.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/cs-CZ.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/ca-Es-VALENCIA.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/ca-ES.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/bs-Latn-BA.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/bn-IN.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/bg-BG.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/az-Latn-AZ.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/as-IN.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/ar-SA.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/am-ET.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
tools/wta/locales/af-ZA.yml Adds localized keys for /switch-agent summary + system messages (currently English text).
src/cascadia/inc/AgentRegistry.h Adds Ollama as a built-in delegate agent and clarifies it is not hostable as an ACP agent.
Comments suppressed due to low confidence (4)

tools/wta/src/app.rs:1

  • The command/docs describe switching the agent for this pane/tab without affecting other tabs, but the implementation clears session_to_tab and resets every tab in tab_sessions (including chat history and completed turns). This will unexpectedly wipe other tabs’ state. To match the documented behavior, only reset the current tab’s session/state (and remove only the current tab’s entries from session_to_tab), leaving other tabs intact; alternatively, if the restart is intentionally global, the docs/messages should be updated to reflect that it affects all tabs.
    tools/wta/src/app.rs:1
  • The selection list/validation uses KNOWN_AGENTS, which now includes ollama with acp_launch_command: \"\" and (per src/cascadia/inc/AgentRegistry.h) is delegate-only and not hostable in an agent pane. As-is, /switch-agent ollama will be accepted and then attempt to restart using build_agent_cmd(\"ollama\"), which is likely invalid or unsupported. Consider filtering /switch-agent to only agents that are actually switchable (e.g., ACP-hostable profiles, or profiles with a non-empty launch command), and omit non-hostable agents from the list message and validation.
    tools/wta/src/slash_command_tests.rs:1
  • This test hard-codes the assumption that every KNOWN_AGENTS entry is switchable via /switch-agent. With the new ollama profile (and the C++ registry comment that Ollama is delegate-only and not hostable), this test will either enforce incorrect behavior or become brittle. Recommend iterating only over the subset of switchable/hostable agents (e.g., a dedicated registry slice for ACP-hostable agents, or filtering by a concrete predicate such as a non-empty launch command) and updating the test name/comment accordingly.
    tools/wta/src/app.rs:1
  • The /switch-agent implementation mutates tab_sessions (potentially across multiple tabs), but the added slash-command tests only validate the current tab’s state. Add a test that creates at least two tabs, invokes /switch-agent in one tab, and asserts the other tab’s session/chat state remains unchanged (or, if the intended behavior is to reset all tabs, assert that explicitly). This will prevent regressions around cross-tab state handling.

// (claude via @agentclientprotocol/claude-agent-acp, codex via
// @zed-industries/codex-acp).
// Only these agents can be hosted in an agent pane.
// Ollama is intentionally absent: it has no ACP adapter and cannot be
{ L"claude", L"Claude" },
{ L"codex", L"Codex" },
{ L"gemini", L"Gemini" },
{ L"ollama", L"Ollama" },
{ L"claude", L"Claude" },
{ L"codex", L"Codex" },
{ L"gemini", L"Gemini" },
{ L"ollama", L"Ollama" },
acp_auth_flow: AcpAuthFlow::None,
delegate_prompt_flag: PromptFlag::Positional,
model_flags: &[],
install_hint: "Install Ollama from https://ollama.com",
delegate_prompt_flag: PromptFlag::Positional,
model_flags: &[],
install_hint: "Install Ollama from https://ollama.com",
install_url: "https://ollama.com",
Comment thread tools/wta/src/agent_registry.rs Outdated
// Bare /switch-agent: no agent name provided. Should emit a system message
// listing available agents and NOT trigger a restart. We verify no restart
// by checking session_id is unchanged (restart clears it).
app.session_id = "pre-existing-sid".to_string();
);
// session_id must be unchanged — no restart was triggered.
assert_eq!(
app.session_id, "pre-existing-sid",
#[test]
fn slash_switch_agent_unknown_agent_emits_error() {
let mut app = test_app();
app.session_id = "pre-existing-sid".to_string();
);
// session_id must be unchanged — no restart was triggered for unknown agent.
assert_eq!(
app.session_id, "pre-existing-sid",
@github-actions

This comment has been minimized.

@github-actions

Copy link
Copy Markdown

@check-spelling-bot Report

⚠️ Dictionary not found

Problems were encountered retrieving check dictionaries (cspell:cpp/src/stdlib-cpp.txt cspell:monkeyc/src/monkeyc_keywords.txt cspell:ada/dict/ada.txt cspell:typescript/dict/typescript.txt cspell:python/src/additional_words.txt cspell:clojure/src/clojure.txt cspell:gaming-terms/dict/gaming-terms.txt cspell:sql/src/sql.txt cspell:cpp/src/stdlib-cerrno.txt cspell:html/dict/html.txt cspell:cpp/src/compiler-msvc.txt cspell:node/dict/node.txt cspell:software-terms/dict/softwareTerms.txt cspell:npm/dict/npm.txt cspell:java/src/java.txt cspell:powershell/dict/powershell.txt cspell:python/src/python/python.txt cspell:css/dict/css.txt cspell:rust/dict/rust.txt cspell:cpp/src/lang-keywords.txt cspell:haskell/dict/haskell.txt cspell:scala/dict/scala.txt cspell:python/src/python/python-lib.txt cspell:fullstack/dict/fullstack.txt cspell:cpp/src/ecosystem.txt cspell:public-licenses/src/generated/public-licenses.txt cspell:cpp/src/lang-jargon.txt cspell:php/dict/php.txt cspell:python/src/common/extra.txt cspell:cpp/src/people.txt cspell:elixir/dict/elixir.txt cspell:dart/src/dart.txt cspell:k8s/dict/k8s.txt cspell:redis/dict/redis.txt cspell:cpp/src/compiler-clang-attributes.txt cspell:svelte/dict/svelte.txt cspell:latex/dict/latex.txt cspell:shell/dict/shell-all-words.txt cspell:dotnet/dict/dotnet.txt cspell:public-licenses/src/additional-licenses.txt cspell:swift/src/swift.txt cspell:ruby/dict/ruby.txt cspell:cpp/src/template-strings.txt cspell:cpp/src/stdlib-c.txt cspell:lua/dict/lua.txt cspell:cpp/src/compiler-gcc.txt cspell:django/dict/django.txt cspell:docker/src/docker-words.txt cspell:r/src/r.txt cspell:sql/src/tsql.txt cspell:golang/dict/go.txt cspell:software-terms/dict/webServices.txt cspell:java/src/java-terms.txt cspell:cpp/src/stdlib-cmath.txt).

⚠️ For more information, see check-dictionary-not-found.

🔴 Please review

See the 📂 files view, the 📜action log, 👼 SARIF report, or 📝 job summary for details.

Unrecognized words (4)

ollama
remotesigned
segfaults
Subscribe'd

These words are not needed and should be removed allsigned Backgrounder CANTCALLOUT Ccc cplusplus ctl Debian dotnet drv endptr EOFs evt Fullwidth gitlab hdr idl IME inbox ININPUTSYNCCALL intelligentterminal Ioctl KVM lbl lld lsb NODEFAULT NONINFRINGEMENT notif oss outdir Podcast pri prioritization rcv segfault SND sourced SWP Tbl testname transitioning unk unparseable unregisters Virt VMs webpage websites WINVER xsi

To accept these unrecognized words as correct and remove the previously acknowledged and now absent words, you could run the following commands

... in a clone of the git@github.com:ashishpatel26/intelligent-terminal.git repository
on the fix/issue-295-per-tab-agent branch (ℹ️ how do I use this?):

curl -s -S -L 'https://raw.githubusercontent.com/check-spelling/check-spelling/cfb6f7e75bbfc89c71eaa30366d0c166f1bd9c8c/apply.pl' |
perl - 'https://github.com/microsoft/intelligent-terminal/actions/runs/27689675121/attempts/1' &&
git commit -m 'Update check-spelling metadata'
Available 📚 dictionaries could cover words (expected and unrecognized) not in the 📘 dictionary

This includes both expected items (2064) from .github/actions/spelling/expect/alphabet.txt .github/actions/spelling/expect/expect.txt .github/actions/spelling/expect/web.txt and unrecognized words (4)

Dictionary Entries Covers Uniquely
cspell:csharp/csharp.txt 32 2 2
cspell:aws/aws.txt 232 2 2
cspell:fonts/fonts.txt 536 1 1

Consider adding to the extra_dictionaries array (in the .github/actions/spelling/config.json file):

    "cspell:csharp/csharp.txt",
    "cspell:aws/aws.txt",
    "cspell:fonts/fonts.txt",

To stop checking additional dictionaries, put (in the .github/actions/spelling/config.json file):

"check_extra_dictionaries": []

Forbidden patterns 🙅 (2)

In order to address this, you could change the content to not match the forbidden patterns (comments before forbidden patterns may help explain why they're forbidden), add patterns for acceptable instances, or adjust the forbidden patterns themselves.

These forbidden patterns matched content:

Should be preexisting
[Pp]re[- ]existing
Should be reentrancy
[Rr]e[- ]entrancy
Errors and Warnings ❌ (2)

See the 📂 files view, the 📜action log, 👼 SARIF report, or 📝 job summary for details.

❌ Errors and Warnings Count
⚠️ check-dictionary-not-found 53
❌ forbidden-pattern 5

See ❌ Event descriptions for more information.

✏️ Contributor please read this

By default the command suggestion will generate a file named based on your commit. That's generally ok as long as you add the file to your commit. Someone can reorganize it later.

If the listed items are:

  • ... misspelled, then please correct them instead of using the command.
  • ... names, please add them to .github/actions/spelling/allow/names.txt.
  • ... APIs, you can add them to a file in .github/actions/spelling/allow/.
  • ... just things you're using, please add them to an appropriate file in .github/actions/spelling/expect/.
  • ... tokens you only need in one place and shouldn't generally be used, you can add an item in an appropriate file in .github/actions/spelling/patterns/.

See the README.md in each directory for more information.

🔬 You can test your commits without appending to a PR by creating a new branch with that extra change and pushing it to your fork. The check-spelling action will run in response to your push -- it doesn't require an open pull request. By using such a branch, you can limit the number of typos your peers see you make. 😉

If the flagged items are 🤯 false positives

If items relate to a ...

  • binary file (or some other file you wouldn't want to check at all).

    Please add a file path to the excludes.txt file matching the containing file.

    File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

    ^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

  • well-formed pattern.

    If you can write a pattern that would match it,
    try adding it to the patterns.txt file.

    Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

    Note that patterns can't match multiline strings.

@ashishpatel26

Copy link
Copy Markdown
Author

@microsoft-github-policy-service agree

@frarteaga

Copy link
Copy Markdown

I tested this branch and wasn't able to get different agents per tab — switching the agent in one tab switched it everywhere. Here's why the current approach can't work:

1. agent_cmd is dropped before it reaches C++
In tools/wta/src/protocol/acp/client.rs (~line 2739), when the helper handles restart_rx.recv(), it receives the correct req.agent_cmd, but the JSON event it fires to WT is:

{"type": "event", "method": "restart_agent_stack", "params": {}}

The new agent command is silently discarded and never reaches the C++ side.

2. SharedWta is a process-wide singleton (architectural blocker)
Although TerminalPage._agentPane is independent per tab, every tab calls SharedWta::Instance() (SharedWta.cpp:15). There is exactly one wta-master process for the entire Windows Terminal window — there's no way to run a different agent per tab without changing this.

3. wta-master spawns a single agent CLI
wta-master spawns one agent subprocess in run_master_loop (tools/wta/src/master/mod.rs). All helpers from all tabs connect via named pipe to this same master and share the same agent subprocess.

4. Restarting master disrupts all tabs
Even if agent_cmd were forwarded correctly, calling SharedWta::Restart() kills the current wta-master and disconnects every helper. When the new master starts with the new agent, all tabs reconnect to it — so every tab switches to the new agent at once, breaking active sessions in other tabs. The code comment at TerminalPage.cpp:4449 describes exactly this behavior.


To support truly independent agents per tab simultaneously, this would require a significant architectural refactor: SharedWta would need to manage a map of wta-master processes keyed by agent type (one process per agent CLI, e.g. one for claude, one for copilot), or wta-master itself would need to internally multiplex multiple agent subprocesses and route each helper to the right one.

@vanzue

vanzue commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

Thanks for this! I dug into the flow and have a few concerns — if I understand the code correctly:

1. In the helper+master path, the agent isn't actually switched. cmd_switch_agent sends RestartRequest{ agent_cmd: Some(new_cmd) }, but the helper's restart_rx handler (client.rs:2597) ignores agent_cmd and emits restart_agent_stack with "params": {}. The C++ handler OnRestartAgentStackRequested(hstring /*eventJson*/) ignores the payload too and respawns master "with the cached spawn args (same agent CLI)" (TerminalPage.cpp:4540). So /switch-agent claude seems to restart back into the same agent — the new command never crosses the bridge.

2. It wipes every tab. Before the restart, the handler clears clear_chat_history() / completed_turns / session_id across all tab_sessions plus the whole session_to_tab map, so other tabs lose history. This contradicts "Other tabs are completely unaffected."

3. The single-agent master is unchanged, so per-tab agents still can't coexist. If I understand correctly, this PR only touches the registry/command layer — wta-master still spawns one agent CLI (spawn_agent_process(&cli.agent, …)) and fans all panes onto it, so there's one agent process per window and any switch is global. The real fix for #295 would need a multi-agent master, which is already in flight in #296 (Per-tab AI agents via a multi-agent wta-master). It'd be worth reconciling this PR with that effort rather than layering a slash command on the single-agent model.

Minor: /switch-agent validates against the full KNOWN_AGENTS, including ollama (delegate-only, empty ACP command), so /switch-agent ollama is accepted but can't be hosted in a pane.

@vanzue

vanzue commented Jun 26, 2026

Copy link
Copy Markdown
Contributor

Thanks so much for putting this together, @ashishpatel26 — really appreciate the effort and the clear write-up, and the Ollama registry cleanup along the way. 🙏

After digging into the architecture, we're going to go with #296 (Per-tab AI agents via a multi-agent wta-master) for #295, since it matches the direction we want: it reworks wta-master into a multi-agent broker so each tab's helper declares its own agent (GPO-validated, id-based) and the master lazily spawns/reuses one CLI per agent. That gives true per-tab agents running simultaneously, with switching scoped to a single tab (no shared-master restart, sibling tabs untouched) — the per-tab independence this PR was aiming for, solved at the architecture layer.

Given the two PRs target the same issue and #296 is the route we're taking, I'll close this one to avoid overlap. Thank you again — your investigation comments here were spot on and genuinely helpful in confirming the approach. Hope to see more contributions from you! 🙌

@vanzue vanzue closed this Jun 26, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Per-tab AI agent: run a different agent (e.g. Gemini and Claude) in each tab

5 participants